From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 25 Nov 2008 14:20:57 +0000 (+0100)
Subject: Merge branch 'topic/fix/hda' into topic/hda
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~23770^2~45^2~12
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=eefe93b9957e6f14780b7d37aeda0f27f341953d;p=linux-4.9.git

Merge branch 'topic/fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_sigmatel.c
---

eefe93b9957e6f14780b7d37aeda0f27f341953d